fixed #95, #100