Should we unlock here before returning?