Fixed issue with non known arguments