BUG 866011 added suggestion from Pin