Fixed issue with empty parameters