Fixing bug where cell state is not set when animating is NO