Updated issue #26