fix issues/188