Resolved timeout problem