usercontroll fix
merging fix