More Fix for #894