Issue #247 Fixed according to remarks