Fix closes #150