Fixed issue related to #1734