fixed a major subscription bug