Bug fixed: reset vars and from method