Fixed null optons bug