Fixing arguments passing