Bugfix with non persisted comments