Fixing in-progress (2)