Sunlight bugfix