Correct fix for all databases