bugfixes from experimental