Fixed argument type checking