Temporary fixed Issue #102