Hotfix/comment bug