Permission saving fix from 4.1