fix to mitigate issue #98