add condition to not create extra annotations