Bug fix #529
Merge pull request #594 from aRn0D/user-fix

[WIP] Bug fix #529