Fix bad argument detection code(?)