Bugfixing... plz work.