Fix for CORE-459