Partially fixed Issue #11