Fix for CF-147