second bug fix