FIX - issue #15
FIX - issue #12