#41 and #19