fix bug #2021