added fixed for db use