Fix for issue #22 and #41