Solution for #122. Works with save games