Try make WhenIPressSave more reliable