Fixed animation problems