Fixed bugged shift argument parsing