Working version for Django 1.6