Bug Fix, DB script