Fix for older apis