Fix argument juggling, 0.0.2