Move to async calls to avoid deadlocks