Reinstate Michael Kaply changes for Issue #9