Bugfixing v. 1.1