fix second occurency as well