Hotfix issue with automatic release of connection