FIX - issue #16