bug #338, bug #340
bug #341