Fix subscriber code bug