Add correct timezone bodge to manualdraw code