Commited #464 after modification.