second part of fix --wink