Fix by morphace to close issue #1458