added fix for comments time issue