Fixing default arguments controls