Adding more to Issue #338