Correct Fix Database creation.

Correct Fix Database creation.