[FIX] API Timeout added

Fixes #1643