Fixing non passing subscription issue