manually implement fix from wozz