Fix closes issue #36