#26 and #54