changed device resolution to account for non-zero device number