Fixed issue with object selection