fixed Issue 7