Fix quick insert and remove card