Continues tweaks for issue #276