Fixed return from api dispatch