Hotfix to allow both times to be set independently
manually merged