Fix for freeze happening with certain projects

Fixes #32