Bug on button next time is resolved