Fix for #46