Fixed the broken 4.2