fixing issue #16