Issue #176 - Fix unfreezing points