fixed bug 58 cancel button issue