fixed #94, fixed #97