fix bug 2 Cancel buttons