fixed profile problem
merge