Fix plugin causing fatal error #807