Fixed to work with newer OlegDB versions