Make input not so brittle