partial fix to guest saving