Reverting Bugfix because it's actually causing the bug for me