tweak to default only_if function