fix save with hackery