RAA-11: previous approach didn't work on device