Fix of Issue #148