Rand etimeout

Fix #1235
I do not quite understand what do you mean. I think it is good enough though.