bugfixes for 0.4