Fix for #1750