Changed flag to true again due to huge performance difference