Adding a patch, proposed by Andreas, to enable all targets.