DbTools Fix