Fix for #1336