One bug fixed. Another one pending
Revert "One bug fixed. Another one pending"

This reverts commit 69c03abfc67059cfd2fe90e4dc0e192f764d3ab8.
Revert "Revert "One bug fixed. Another one pending""

This reverts commit 8a16917551fc91060b6a5057c723c48a033f34fb.
another one