Attempted bug fix