simpler and hopefully more effective timezone fix