Fixed CORE-2011