Fixes #4635
Merge pull request #4783 from mwerezak/open-space

Fixes #4635