attempted fix v2