Fix for #679