DB Related bug fixed