Final version of the bugfix for 572

Fixes #572
Improves upon #573 
@everzet should the check by name really be there ? The arguments passed to this method are indexed numerically