bug with date fix