AVOP-327 Stop the original time! part 2