Refined sig handler even more