FIX issue #128