Fixes BUILD ERROR in previous merge