fixing issue #14