fixed message/argument parsing