Fixes #5043
Merge pull request #5046 from mwerezak/lightbulb-box

Fixes #5043