amendments to get #54 fix working