Merged in bash4 fix