fixed bugs in 3gs