improve extra detection