fix for CORE-2897 ?