Is working now correctly without animations