Fixed other part of Issue #141