I believe this fixes Issue #1