Fix issue with missing parameters