Resolves Issue #1 (API Fix)