Removed references to name field to prevent application crash.