Fix old maker function in merge from master