Fixing *both* dates