fixed Issue 212