Comment and create date fix