fix issues #88