fix date deconstruction issue