fixed issue #11. testing pending.