Fixed WebImage handling