re-enabled Miller's proposed fix (still in testing stages as it did not exhibit itself as a problem beforehand)