temporary solution for #29