fixed bug #22