Fixed bug with Comments not being added