Resolve #378 and #384