Fixed a bug

Fixed a bug that was almost getting one of our users to churn. Spent the whole weekend figuring out the root cause. Couldn't do so. It suddenly popped up in mind during our weekly call!