fix mantra bugs