Missing part of fix for Bug: 12486