I think @florent did various modifications recently to handle those cases automatically.