#394 and #392