Fixing Database issue on 5.10