Comment 3 for bug 658394

Fix on rev 2099