Less aggressive workaround