Comments bug-fix