DB crash fix