revisions/fixed-crash-on-back