Add issue #24