fix task #238