Issue #1 bug fix on C C++ Java