fixeing the bugfix for the bugfix