Potential final fix for timezone general issue