fixed bug #2;