Finally fixed recycle bugs, I think!