Revert "Bug Fix"

This reverts commit 8746fd810913e84c946c2a290fbcda9d549d9246.
Revert "Revert "Bug Fix""

This reverts commit cbf90814c3b378d347cedba06879c32afa19d9f1.