fix for bug #28