Update fix to add a warning emit