Fix #61 for older devices