Order of locations in the source file were not kept after conversion

Fixes #19