Temporarily fix ISSUE #16