Yet another attempted fix