Fix graceful leave of co-ordinator