Fixing it up - part 1677

Fixing it up - part 1677