Fix for #7: active not being updated