#24 and #21