fix issues/25