Correctly stopped comment functionality