Definite fix for 61128 (Mantis 983).  More tests pending.