Bug#606487: patch for freezing

[Ibán Cereijo]

Hi Niv,
Please let me work on it before that, there are some other issues I want to
address.
I'll give you a stable version (soon).
Thank you,
Ibán.