Bugfix on the bug fix