Fix for SWF-1619