Somewhat nicer fix