make sure short_title is callable before calling it
Merge branch 'callable-fix'