Bug Fix2
Revert "Bug Fix2"

This reverts commit 37af0c89fb834c004ca02511a82bc0d8c43395c3.