improved handling of non sig.