Date Bug Fixed