ticket:13 field fix