Fixed date becoming nil bug