Bug fix for wrong arrangement of arguments.