Fix for light selection