fix onchange returning null not cancelling change bug