Address issue #114