Adding issue #46