Extra check for #342