Goes together with https://github.com/pdidev/pdi/issues/629
Goes together with pdidev/pdi#629