Method bug fix (Thnx Tao)