Additional fix for the updated DB