Work around Adhearsion bug