bugfixing for alpha release