Bug fixed and divers