fixed bug #21