fixed error due to merge from smrede