FIX issue #44