Code

Fix argument processing (Felix Frank - 1690697)