Bugfixe in earlier code