Fix to work with legacy