acually fixed Issue #568