Better flickr fix