Added issue #26