tweaks related to #25