Undone last change because it generate a lot of CoreGraphics errors when running on device (iPhone 4)