toward fixing issue #25