resolves #309