Fix issue with reusing views