Improved behaviour on connection loss