Tempory fix for a bug about argument parsing