Fixing arguments size