Fixed location, removed separate code path
More fix
Moar fix