Fix for APIs