Support for -5h in from #1294