More compatibility to old mod