in progress #117
fixed #117