Fix removing -- from argument list