FIx issue #2