Workaround for HGV save bug