Fixing arguments bug