Plate fix develop

Same as #839 now applied onto ```origin/develop```