Issue #8309 by cableman: Fixed accepted answers