Fixed device v.s. simulator issue