I'm working up an alternate patch here