Slight logic bug in last fix.