Issue #29. Third fixes