Fixes #2 - Bug with wrong commenting