Fixed with database