Quick fix solution for CORE-269