Fixes argument parsing