Update for an Issue #342 and #372