Changed to work with Django 1.5