bug fixed & state support