Attempt 2 at getting patch right