smothing fix
merge from Greg