uglier solution to cope with django16
should be ok with 1.6 now