#333 partial fix (to accept-mine during merge)