spotify: Fix for #387 fixes #425 too