- bugfixes from 0.30