Fixed API compatability