Now it works in more cases.