Revert "fixed a bug found in production"

This reverts commit a5e58175942359f7290d1fe4b76c017f7019299f.
Revert "Revert "fixed a bug found in production""

This reverts commit f06d5015190da2e663d9681733b5d85fbaf2dc5c.