second commit, bugfixing