Fixed CORE-1823 bug