fixed bug #1;