minor beginning of Issue #550 fix, still lots to do