[#54] Swap dates when they are confused