Make the workaround more conservative