bugfixing #2