bugfixing 2000