Making proposal for fixing problems identified in #451.