bugfixing  oct16