Make workaround less verbose