Added timezone warning workaround