Fix duplicate subscription