Address issue #16