Fixed Animation problems