Fixes for robert re issue #153