resolves #310