fixing issue #26