Fixed logic issue with subscription checking