partial fix CORE-2897