redoing uncommitted changes pointed out by #126