In progress of fixing #161, bare editing works already.