FIX issue #646

FIX issue #646