Bug attempted fix