Corinne Brown, Fixes #458