Fixed missing change for previous bug fix