App Bug fixed