Added fix with non required parameters