This Fixes Issue #19