Tweaks for issue #16