attempts at bugfixing