Attempting to resolve #131, but no go.