Add issue #44