Fix for Raw DB