Fix issue where bank might be renamed unnecessarily