added Ubuntu bug-fix back in. Still seems to be a problem, even in 14.04.