fix second part of bug introduced by my last commit