fix issues #31