Darn, uncommented the horrible location hack...