A fix for #46