fixed bug #26