fix joke bugs