Closes Feature #1651
tweaks for issue #1651