This fix is slightly more sane