Updated issue #11.