Date BUG fixed