Fixed device tracking bug