Changed priority on the filter_images filter. It executes later now because the markup could be removed by shortcodes.
tagging 1.4.3