Eugene bug fix!