Fix bug with reusing