Bugfixing tom