Fixed active not being updated