Fixes initial & remove state animation