- Missing fix from previous commit, fixes NPE in object picking