Improve after https://github.com/trikset/trikRuntime/pull/696
Improve after #696