I think this will fix the 'album is not defined'-bug