Actually commited the change for #23...