Fix for #477