fixed issue #6 (corrected)