Missed this change from Tobias on master