Bugfix and django 1.7 compat