#121: fix ekko structure