FIX issue #9