Fixed bug that left orphaned comments