elaboration bugfixing