fix issue GH-72