Revert "BugFix"

This reverts commit 58d1873f08b6dfecd62ce226acdb55c214fbaaf7.