Fix issue with splitting parameters