Bugfix for django 1.6