Small patch to last feature added.