Fixed with new API