Some special cases were added.