Fix for issue #433.
Fix for  issue #386.
Updated to r569