exception fix
merge