Fix double adding issue causing blocks not to be removed.