some VERY temporary fixes introduced