Fix for None submasks.