fix task #231