Fixing Date extension