Fix issue with 2 arguments