Add workaround for system dependent date comparison