Bug fixed continued