fixing issue #13