Fixed issue from last merge