- Fixed databuilder leak