Try again to fix wrong variable scope...