Hot Fix to avoid db lock timeouts.