fix bug 574
Merge remote-tracking branch 'mikesc/bug574'