Fixed buggy object interaction
Merge Andrei & Chris