Fixed part of Issue #141