fixing issue #12