Fix for #459 in master