FIX issue #602

See issue #602