hopefully last bugfixes