Added work-around for album cover issues, probably addresses issue #25