Fixed issue with input parameters