#18 and #21