Correct controller error
Merge branch 'tumblr'