Revert "Fix for issue 397"

This reverts commit 0fc16af07d8dfe4ef2e30923c7d0ba60fe3306e8.
Updated fix for Glimpse 397