fix is tested and seems to work