Fix compatibility with prevoius version