Fix for #1653