fix null subscription