Feature/time correction