Issue #29. First fixes