Fixed subscription check again