Fixed from database changes