Proper fix for '3f37b6e Fixed missing-args bug' - now it works after the first use also..