bug #1130 fixed