fix to bug #1406

Trying to fix issue #1406