Probably not the simplest fix, but OK.