Revert "Revert "BugFix""

This reverts commit 086c297c6bd91550fc5a519cbc54ee95c27f9f82.