Added issue #24