Fixing it up - part 1677