issue #59 apply corrections