Add an extra check, in case this is the reason for #25