fixed CORE-1811