Fix to working with last versions