Fix so only "fun" triggers. Fix function error.