attempt at fixing API issues