Address issue #119