fixing issue #25