fix issue with tapir