Fixed issue with 3GS and 2GS