Fixed issue with empty params