epatch fix, little rusty