Workaround for the pass-through issue

Just a temporary solution until that has been properly fixed.