Minor (and temporary) workaround