Quickfix to respect old format for argument list on WSO