Fixed DB leak