More robust solution (works with older and patched SA)