fixing issue #13 (not yet completed)