Resolved part of https://github.com/openETCS/toolchain/issues/134