Fixed location weirdness for #286