resolves #357