Verdere bugfixing