Make change from #19 which was closed.