More bullet-proof check