Revert "Fix bug 1"

This reverts commit 35566337b12a27b043810a021985393736a3b482.