Another bug fix -_-