bug fixes with network timeout