Bugfixing - still buggy