Add a timeout to make it work better