Fix 'Flickr'
Fix 'Flickr' - Closes #696