bugfixes in higher level