correct ambiguities pointed out by Thomas Bork