Fixed bug where multiple album entries would be created rather than old ones being used