b078af3 move #savecloyne, better way to fix #4