Time shifting issue

Please test it!