impl temporary solution against #90. to be solved fundamentally later