correction of previous two commits (GH-96)