Fix for missing image-swaps during animation