bugfixes for downwards compatibility