Fixed issue with multiple parameters