Fix reuse functionality