WIP tem work-around for #786