Fix for bug report #137