Another attempted fix