See #436 and #423 for more context. I think the current fix works but if the users access the neighborlist directly it might give wrong results.
