Hack to make location work