Thank you, eclipse's local history; fix #4; fix #5