fix for bug #629