Make it slightly more idiot-proof.