Deprecated Moment api fixed