#32 and #31