Fix of Issue #528