issue #622 fix + other minutae