Revert "Revert "Revert "bug fix#1"""

This reverts commit 27291eebfa06e0f34fef9062ae3c11a7b93d2423.