resolves #136