Fix plugin return value handling (again)