correction of the light refactoring