Working on issue #164

#164