#17 and #94