moved defensive for easier tumblr handling