Fixing the dates being sent to remote depending on the situation