fix for bug #1174