Fix issue with default args