TEMP: Add return to fix conn hang