fixing issue #18