Additional plugin fix