integrated @mwhite's post-load fix