Fix album check
Merge branch 'master' into develop