FIX issue #85