Fixed argument weirdness