PR for issue #365.