fix for picasso issue #249