fix of fix#17