FIX - issue #11