FIX  pg.albumId != undefined