#95 fix