Issue #8 modified