Address issue #95