Bugfix: timeout in API (2)