Fixed another subscription issue