attempted fix v3