elaboration bugfix