Fix for Next50 class bit mask propagation to esd