Fix object picking