Fixes concerns raised in Ref rSK3f7b410d780c