Bug fix: CORE-158