#95 fix bug