fixed errors with new fields