fix bug #26