Fixed Migration + Timestamp  Issue