Rewire feature request; fix #237