Fixed issue with all pick argument order