Fixed for light issues