Fixing massive DB crash