Fix object interaction