Fix freezing in some cases
Bump version