Fix should_skip