Added hack to use normal animation