One last bug fix zzz