Fixing minor bug caused by merge from qa