Working on fix for issue #15