Fix for #1319