removed timeout to fix problem in polling