fixed bug #7