Fix ext. properties being lost on leaving the end