Do the -x thing in a more robust way