Review Tobias: Fix timeout