Fixed ForeignKey issue with 1.6