fix for bug #628