More bug fix

Yay?