Fix tthe Issue #45, please update it.