Fix for date models