Another possible bug fix