Addressing https://github.com/openETCS/toolchain/issues/126