Fix issue with splitting on :