Bug fixed and faster