fixing issue #46