Fixing the last 1.7 bug. This is stable.