Fixed key bug in association mapping for includes. For #37