Bug Fix of light