Bugfix for Django 1.6