Fixed samsung bug