Merge pull request #2340 from Fnordlab/master

[chilloutzone] Fixes refactoring bug