bug #774 - corrections