case 2257 - Hot fix for a fatal error.