Bug fix for tracking hardware database