More correct, but still not right