Another hotfix: bug outcommented