Fix for #1428