Fixing keyword arg order