bugfixing 1-7