fixing issue #15