Added compatibility with IC2