Fix Show Album as well