pulling in a fix from caribou-core