fixing issue from last merge?