Important bug fix!