Fixed issue with times mxing up XD