Fix issue #15 and #24