next bugfixes, still does not work