Updated as #515 was done in last commit