initial Bug fixed