Partial fix for habitatUI