Temporary fix for views.py
Pulled in changes