Bugfix from forum message