Bug fix: Not everyone lives in EST-land