fixes isse #16