Fix issue with splitting up multi-imports