make fix less patchy