Fixed: internal argument parsing