second part of fix