Fixing arguments handling